Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 25 Jan 2010 21:57:27 +0000 (21:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 25 Jan 2010 21:57:27 +0000 (21:57 +0000)

Trivial merge